From c1eb6133d4674d86c18873347f1134c9508e5837 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 28 Mar 2005 06:03:42 +0000 Subject: [PATCH] Don't pop up the context menu of the search entry if it is not visible. 2005-03-28 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up the context menu of the search entry if it is not visible. (#169534, Billy Biggs) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 7 +++++++ 4 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7dccdcc454..75c7c6c22e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-28 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up + the context menu of the search entry if it is not visible. + (#169534, Billy Biggs) + 2005-03-27 Tor Lillqvist * configure.in: Apparently AC_LIBTOOL_WIN32_DLL isn't deprecated diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7dccdcc454..75c7c6c22e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-03-28 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up + the context menu of the search entry if it is not visible. + (#169534, Billy Biggs) + 2005-03-27 Tor Lillqvist * configure.in: Apparently AC_LIBTOOL_WIN32_DLL isn't deprecated diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7dccdcc454..75c7c6c22e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-03-28 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up + the context menu of the search entry if it is not visible. + (#169534, Billy Biggs) + 2005-03-27 Tor Lillqvist * configure.in: Apparently AC_LIBTOOL_WIN32_DLL isn't deprecated diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1085da00c5..39bac58ff1 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4365,6 +4365,7 @@ gtk_tree_view_key_press (GtkWidget *widget, gboolean retval; GdkScreen *screen; gboolean text_modified; + gulong popup_menu_id; gtk_tree_view_ensure_interactive_directory (tree_view); @@ -4374,6 +4375,9 @@ gtk_tree_view_key_press (GtkWidget *widget, ((GdkEventKey *) new_event)->window = tree_view->priv->search_entry->window; gtk_widget_realize (tree_view->priv->search_window); + popup_menu_id = g_signal_connect (tree_view->priv->search_entry, + "popup_menu", G_CALLBACK (gtk_true), NULL); + /* Move the entry off screen */ screen = gtk_widget_get_screen (GTK_WIDGET (tree_view)); gtk_window_move (GTK_WINDOW (tree_view->priv->search_window), @@ -4387,6 +4391,9 @@ gtk_tree_view_key_press (GtkWidget *widget, retval = gtk_widget_event (tree_view->priv->search_entry, new_event); gtk_widget_hide (tree_view->priv->search_window); + g_signal_handler_disconnect (tree_view->priv->search_entry, + popup_menu_id); + /* We check to make sure that the entry tried to handle the text, and that * the text has changed. */ -- 2.30.2